Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / .project

diff --git a/ruralHouses client/.project b/ruralHouses client/.project
new file mode 100644 (file)
index 0000000..755d15b
--- /dev/null
+++ b/ruralHouses client/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>ruralHouses_client</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>